projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d42c8a
)
* xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.
author
Ken Raeburn
<raeburn@raeburn.org>
Mon, 8 Jan 2001 19:35:06 +0000
(19:35 +0000)
committer
Ken Raeburn
<raeburn@raeburn.org>
Mon, 8 Jan 2001 19:35:06 +0000
(19:35 +0000)
src/ChangeLog
patch
|
blob
|
history
src/xfns.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 9bb979690d403035c8b538520166ac5f2cdfcabb..b980a9524b5e1f540b04846b5d3f0b648d5fc878 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,8
@@
+2001-01-08 Ken Raeburn <raeburn@gnu.org>
+
+ * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I
+ in inner block.
+
2001-01-08 Gerd Moellmann <gerd@gnu.org>
* window.c (window_scroll_pixel_based): Adjust glyph matrices
diff --git
a/src/xfns.c
b/src/xfns.c
index 1d277b081c8ab389bea2c2c22d8231863a99e25a..037a0baa2946bd815111761fc5d4c535675e61a4 100644
(file)
--- a/
src/xfns.c
+++ b/
src/xfns.c
@@
-7331,6
+7331,8
@@
xpm_load (f, img)
#ifdef ALLOC_XPM_COLORS
img->colors = colors_in_color_table (&img->ncolors);
#else /* not ALLOC_XPM_COLORS */
+ int i;
+
img->ncolors = attrs.nalloc_pixels;
img->colors = (unsigned long *) xmalloc (img->ncolors
* sizeof *img->colors);